Inherit submenu direction from the parent menu.

2004-12-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit
	submenu direction from the parent menu.

diff --git a/ChangeLog b/ChangeLog
index 262f321d86a58f74e923952cd8ef77dc0f83c303..7b3e87ff457ef5cdd10f40d7bf936d378d87b482 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit
+       submenu direction from the parent menu.
+
        * gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first): 
        Return a boolean indicating whether an item in the submenu
        was selected.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 262f321d86a58f74e923952cd8ef77dc0f83c303..7b3e87ff457ef5cdd10f40d7bf936d378d87b482 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-12-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit
+       submenu direction from the parent menu.
+
        * gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first): 
        Return a boolean indicating whether an item in the submenu
        was selected.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 262f321d86a58f74e923952cd8ef77dc0f83c303..7b3e87ff457ef5cdd10f40d7bf936d378d87b482 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-12-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit
+       submenu direction from the parent menu.
+
        * gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first): 
        Return a boolean indicating whether an item in the submenu
        was selected.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 262f321d86a58f74e923952cd8ef77dc0f83c303..7b3e87ff457ef5cdd10f40d7bf936d378d87b482 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-12-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit
+       submenu direction from the parent menu.
+
        * gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first): 
        Return a boolean indicating whether an item in the submenu
        was selected.

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index fd1ad7ccdc4016080093bfcebb3f1d9fd4b21997..c0b966fa6d30a0d9daa2781cd0f65b666cc8312a 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1105,9 +1105,7 @@ gtk_menu_item_position_menu (GtkMenu  *menu,
     case GTK_LEFT_RIGHT:
       parent_menu_item = GTK_MENU (widget->parent)->parent_menu_item;
       parent_xthickness = widget->parent->style->xthickness;
-      if (parent_menu_item && 
-         !GTK_MENU (widget->parent)->torn_off && 
-         !GTK_MENU_SHELL (menu)->active)
+      if (parent_menu_item && !GTK_MENU (widget->parent)->torn_off)
        menu_item->submenu_direction = GTK_MENU_ITEM (parent_menu_item)->submenu_direction;
       else if (direction == GTK_TEXT_DIR_LTR)
        menu_item->submenu_direction = GTK_DIRECTION_RIGHT;